Vladimír Čunát 87c3c0e885 Merge master into #2129 ...

Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix

2014-08-12 19:24:08 +02:00

..

assertions.nix

nixos: evaluate assertions at toplevel, not at systemPackages

2014-04-22 14:09:02 -04:00

check-config.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

crashdump.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

ids.nix

Merge master into #2129

2014-08-12 19:24:08 +02:00

lib.nix

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

locate.nix

locate service: allow customisation

2014-06-24 12:54:16 +02:00

nixpkgs.nix

Manual: Don't include the platform type of the host system

2014-04-25 00:14:55 +02:00

passthru.nix

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

version.nix

Fixing evaluation of misc/version.nix

2014-04-23 14:14:54 +01:00