JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,192 Commits 2 Branches 0 Tags 12 GiB
69da1807f0
Go to file
aszlig 69da1807f0
nixos/xserver: Allow more than one keyboard layout 
Regression introduced by 44c64fef16.

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 <aszlig@redmoonstudios.org>
Fixes: #26961
Closes: #26984
2017-07-03 08:29:20 +02:00
.github github/pr-template: Add note about NixOS tests 2017-06-23 05:33:06 +02:00
doc Merge pull request #26884 from obsidiansystems/purge-stdenv-cross 2017-06-28 21:39:16 -04:00
lib Merge pull request #26929 from jfrankenau/mergerfs-2.22.1 2017-06-29 08:34:44 +01:00
maintainers/scripts Python: improve update script 2017-06-06 17:20:32 +02:00
nixos nixos/xserver: Allow more than one keyboard layout 2017-07-03 08:29:20 +02:00
pkgs Merge pull request #27074 from sh01/shpr_fixurls_kmod_debian 2017-07-03 07:26:09 +01:00
.editorconfig Do not trim trailing whitespace in patch files 2017-01-12 23:44:26 +01:00
.gitignore kde5: consolidate packages into desktops/kde-5 2016-03-01 10:36:00 -06:00
.mention-bot Remove bbenoist from maintainers 2017-03-23 03:03:04 +01:00
.travis.yml Actually disable travis emails 2017-06-03 12:13:29 -04:00
.version version: it's 17.09 not 17.10 2017-02-27 20:46:35 +01:00
COPYING Time passing by 2017-01-01 21:35:52 +01:00
default.nix default.nix: Provide correct instructions how to upgrade Nix 2017-03-18 21:04:07 +02:00
README.md docs: 16.09 -> 17.03 2017-03-30 17:36:44 +02:00

README.md

logo

Build Status Code Triagers Badge

Nixpkgs is a collection of packages for the Nix package manager. It is periodically built and tested by the hydra build daemon as so-called channels. To get channel information via git, add nixpkgs-channels as a remote:

% git remote add channels git://github.com/NixOS/nixpkgs-channels.git

For stability and maximum binary package support, it is recommended to maintain custom changes on top of one of the channels, e.g. nixos-17.03 for the latest release and nixos-unstable for the latest successful build of master:

% git remote update channels
% git rebase channels/nixos-17.03

For pull-requests, please rebase onto nixpkgs master.

NixOS linux distribution source code is located inside nixos/ folder.

Communication: