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 |
||
---|---|---|
.. | ||
default.nix | ||
linux-2.6.39.patch | ||
linux-3.2.patch | ||
makefile.patch | ||
mutex-sema.patch |