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
doc	* Make copy-tarballs.sh work on release.nix.	2010-02-05 14:14:43 +00:00
maintainers	Merging from trunk.	2010-08-02 15:48:19 +00:00
pkgs	Merging from trunk.	2010-08-02 15:48:19 +00:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00
STABLE	* Move stuff.	2005-02-21 16:05:33 +00:00
VERSION	* Bump the version.	2010-02-08 09:23:03 +00:00