nixpkgs/pkgs/os-specific
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
..
darwin fixes #1933 2014-10-23 00:14:09 +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-11-05 15:00:44 +01:00
windows Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00