nixpkgs/pkgs/os-specific
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +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 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
windows Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00