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.55.nix	boost: Pass arguments to generic.nix	2014-11-03 11:14:08 -08:00
1.56.nix	boost: Pass arguments to generic.nix	2014-11-03 11:14:08 -08:00
boost-155-clang.patch	fix boost build with clang	2014-09-09 13:54:26 -07:00
generic.nix	Fix Boost 1.55 build	2014-11-04 15:21:33 +03:00
strip-header-path.sh	boost: Remove dependencies on boost-dev	2014-11-02 17:22:27 -08:00