nixpkgs/pkgs/os-specific
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +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 branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
windows Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00