Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +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	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
strip-header-path.sh	boost: Remove dependencies on boost-dev	2014-11-02 17:22:27 -08:00