nixpkgs/pkgs/os-specific
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
darwin Another attempt to eradicate ensureDir 2014-06-30 14:56:10 +02:00
gnu gnu: Fix (evaluation of the) call to forceSystem. 2014-07-28 20:46:32 +02:00
linux Merge recent master into staging 2014-08-30 10:04:02 +02:00
windows Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00