Vladimír Čunát 52404a868d Merge recent master into staging ... Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 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
..
1.8.nix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
clang.patch	suitable clang stdenv	2014-09-09 13:54:24 -07:00
cpp-4.5.patch
default.nix	Merge recent master into staging	2014-11-05 15:00:44 +01:00
disable-gc-sensitive-tests.patch
eai_system.patch	guile: adding a patch to allow guile builds without chroots	2013-04-02 18:03:08 +02:00
gcov-file-name.patch
setup-hook-2.0.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00