summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/python-sql
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-07-03 08:14:19 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-07-03 08:29:20 +0200
commit69da1807f02daa776472893741c2f82eca8e838d (patch)
tree57a83bb0dca063a884c5b052be87b15daa2043cc /pkgs/development/python-modules/python-sql
parentd97cdfc591baf790ce5a9836e1503dfb0eb152e6 (diff)
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 <aszlig@redmoonstudios.org> Fixes: #26961 Closes: #26984
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions