nixpkgs/pkgs/os-specific
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +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 'staging' into modular-stdenv 2014-09-08 18:16:54 +02:00
windows Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00