Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk ... Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091		2012-02-06 23:03:12 +00:00
..
deb	* Remove `~' from Debian package filenames (they're not allowed in the	2008-06-17 07:53:09 +00:00
rpm	rpmclosure, remove exit	2012-02-02 09:54:16 +00:00
default.nix	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
test.nix	remove aterm242fixes	2011-01-05 09:42:56 +00:00