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

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +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-21 15:09:31 +02:00
windows Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00