Lluís Batlle i Rossell 5417c720fd Merging from trunk. ... I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878		2010-08-02 15:48:19 +00:00
..
0001-Added-support-for-passing-an-impure-NIX_BUILD_CORES-.patch	pkgs/tools/package-management/nix/unstable.nix: added support for (impure) NIX_BUILD_CORES variable	2010-06-23 14:34:47 +00:00
custom.nix	Building Nix from SVN now needs libxml2	2009-09-19 11:40:36 +00:00
default.nix	* Use OpenSSL's implementation of MD5, SHA-1 and SHA-256, as they're	2010-04-21 20:07:26 +00:00
sqlite.nix	svn path=/nixpkgs/trunk/; revision=22472	2010-07-05 08:28:15 +00:00
unstable.nix	pkgs/tools/package-management/nix/unstable.nix: updated to latest version	2010-07-15 14:56:55 +00:00