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
..
cabal-install	Preparing for the upcoming Haskell Platform release.	2010-07-17 13:23:48 +00:00
checkinstall	* Urgh.	2010-03-02 16:33:35 +00:00
disnix	Update Disnix packages to use the 0.1 release	2010-04-01 14:49:05 +00:00
dpkg	* dpkg updated to 1.4.29.	2010-06-16 11:50:06 +00:00
nix	Merging from trunk.	2010-08-02 15:48:19 +00:00
rpm	* RPM updated to 4.7.2.	2009-12-09 22:34:51 +00:00
snix