nixpkgs/nixos
Tristan Helmich 24f3abdafb
Revert "Make services.xserver.xkbDir conflict free when overriden."
This reverts commit 82bcfef109.

cc @nbp

Fixes #22290, #22352.

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
2017-02-01 22:37:04 +01:00
..
doc/manual pythonPackages.ansible2: move 2.2 to separate file, make default 2017-01-27 10:15:31 +01:00
lib test-driver: support punctuation in sendChars 2017-01-08 09:17:05 -05:00
maintainers Create AMIs for eu-west-2 (London) 2017-01-17 21:44:01 +01:00
modules Revert "Make services.xserver.xkbDir conflict free when overriden." 2017-02-01 22:37:04 +01:00
tests Remove myself from maintainers 2017-01-31 11:00:14 +01:00
COPYING Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
default.nix nix: Add a "dev" output 2016-04-18 21:13:18 +02:00
README Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
release-combined.nix nixos/tests/kde5: rename from sddm-kde5 and run by default 2016-09-09 10:12:38 -05:00
release-small.nix nixos/release-small.nix: cleanup to use default versions 2017-01-27 15:33:54 +01:00
release.nix nixos/tests/nat: add test for conntrack helper autoloading 2017-01-25 01:14:05 +01:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.