Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 44c64fef16ed566786c8db276085b484c9d233f3
https://github.com/NixOS/nixpkgs/commit/44c64fef16ed566786c8db276085b484c9d233f3
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-06-22 (Thu, 22 Jun 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
-----------
nixos/xserver: Improve checking keyboard layout
Enumerating the symbols directory doesn't include variants, so we're now
basically doing what "localectl list-x11-keymap-layouts" does but we use
sed instead.
The reason I'm not using localectl directly is because the path to
rules/base.lst is hardcoded in the systemd source.
Of course, the XKB specification allows for much more complicated rules,
but at least this should cover the most basic ones including variants.
So the sed expression itself is just for listing the available layouts
and variants and we use a grep with -xF to match only full lines without
interpreting regular expressions.
This should again allow to set "dvorak" as the layout option.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @lheckemann
Fixes: #25526
Commit: 7a99036cef70dd00cc8a4a5be04ea4a25ab0dca4
https://github.com/NixOS/nixpkgs/commit/7a99036cef70dd00cc8a4a5be04ea4a25ab0dca4
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-06-22 (Thu, 22 Jun 2017)
Changed paths:
M nixos/release-combined.nix
Log Message:
-----------
nixos/release-combined: Add keymap tests
We really want to break channel updates whenever we break something like
this, because this actually will hit machines out there and can be very
much annoying (we had broken keymaps a few times which is why I
introduced these tests in the first place).
Just to be sure I don't break channel updates with this commit, I ran
all of the keymap tests and they all succeeded.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Compare: https://github.com/NixOS/nixpkgs/compare/7c0f6f4be534...7a99036cef70_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
