Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk. ... There were conflicting patches of pkgs/os-specific/linux/module-init-tools. Apparently, the expression was updated independently in both branches. I've resolved the conflict by preferring the patches from stdenv-updates, because those patches appeared to be more sophisticated, i.e. they build the manual, etc. svn path=/nixpkgs/branches/stdenv-updates/; revision=29680		2011-10-06 09:37:22 +00:00
..
all-packages.nix	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
guile-2-test.nix
haskell-packages.nix	haskell-hamlet: updated to version 0.10.3	2011-10-05 17:10:00 +00:00
make-tarball.nix
mingw.nix
perl-packages.nix	* Added Statistics::TTest.	2011-09-27 11:06:41 +00:00
platforms.nix	Updating dos2unix, that now includes also unix2dos.	2011-08-24 07:48:02 +00:00
python-packages.nix	update jinja2	2011-09-30 17:26:38 +00:00
release-cross.nix	Let Hydra cross-build more stuff for GNU.	2011-06-12 21:53:56 +00:00
release-lib.nix
release-small.nix	we would like to test cups	2011-10-03 18:40:12 +00:00
release.nix	kde3: use meta.platforms	2011-10-02 21:15:36 +00:00