Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 7c0f6f4be534
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7a99036cef70
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 22, 2017

  1. 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 <aszlig@redmoonstudios.org>
Cc: @lheckemann
Fixes: #25526
    @aszlig
    aszlig committed Jun 22, 2017
    13 Configuration menu
    Copy the full SHA
    44c64fe View commit details
    Browse the repository at this point in the history

  2. 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 <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    7a99036 View commit details
    Browse the repository at this point in the history