Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: d97cdfc591baf790ce5a9836e1503dfb0eb152e6
https://github.com/NixOS/nixpkgs/commit/d97cdfc591baf790ce5a9836e1503dfb0eb152e6
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-07-03 (Mon, 03 Jul 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
-----------
nixos/xserver: Document the layouts sed expression
This was brought up by @0xABAB in #26984 by the following comment:
https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146405
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 69da1807f02daa776472893741c2f82eca8e838d
https://github.com/NixOS/nixpkgs/commit/69da1807f02daa776472893741c2f82eca8e838d
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-07-03 (Mon, 03 Jul 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
-----------
nixos/xserver: Allow more than one keyboard layout
Regression introduced by 44c64fef16ed566786c8db276085b484c9d233f3.
The services.xserver.layout option allows to specify more than one
layout separated by comma, which the commit above didn't take into
account.
This is very similar to @lheckemann's pull request (#26984) but differs
in the following ways:
* Print out the full list available layouts (as suggested by @0xABAB
in [1]).
* Loop over $layout using the default IFS (and thus no need for
escaping ${cfg.layout}), because the layouts won't contain white
spaces.
* Re-do the error message, which now uses multiple echos instead of a
heredoc, so the line is wrapped according to the viewers terminal
width.
I've tested this with several good and bad layouts and also against the
keymap NixOS VM subtests.
[1]: https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146700
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Fixes: #26961
Closes: #26984
Compare: https://github.com/NixOS/nixpkgs/compare/02ce6963045e...69da1807f02d_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
