Jack Cummings f9fb7b7457 new systemd can't inhibit lid switches ... Conflicts (repos merge): modules/services/x11/display-managers/default.nix		2013-11-01 10:32:24 +01:00
doc	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
lib	Fix backward compatibility with Nix < 1.6	2013-10-30 19:12:25 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	new systemd can't inhibit lid switches	2013-11-01 10:32:24 +01:00
pkgs	gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH	2013-11-01 10:32:24 +01:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00