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
..
1.x.nix	* Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch.	2010-07-23 15:05:20 +00:00
darwin-arch-1.patch	* Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch.	2010-07-23 15:05:20 +00:00
darwin-arch.patch	* Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch.	2010-07-23 15:05:20 +00:00
default.nix	* On x86_64-darwin, "./config" misdetects the system as	2010-07-25 09:09:32 +00:00