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
..
all-packages.nix	Merging from trunk.	2010-08-02 15:48:19 +00:00
guile-2-test.nix	guile-2-test: Remove `guile_1_9_coverage'.	2010-07-04 21:53:01 +00:00
haskell-packages.nix	Switched the default version of ghc and Haskell Platform to 6.12.3 and 2010.2.0.0.	2010-07-22 18:47:59 +00:00
make-tarball.nix	typo	2010-05-18 08:39:31 +00:00
mingw.nix
perl-packages.nix	update ikiwiki and fix its dependencies.	2010-07-09 13:16:00 +00:00
platforms.nix	Setting the proper kernel headers in platforms	2010-08-01 21:05:32 +00:00
python-packages.nix	pkgs/top-level/python-packages.nix: added python-mock-0.6.0	2010-07-28 13:09:04 +00:00
release-cross.nix	Attempt to cross-build Nix for GNU.	2010-06-22 13:02:31 +00:00
release-lib.nix	Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that	2010-05-25 20:38:18 +00:00
release.nix	Minor fix for release.nix.	2010-07-22 18:55:32 +00:00