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
..
2.2.1.4.nix
2.2.1.7.nix
2.3.0.2.nix
2.3.0.5.nix
2.3.0.7.nix
2.3.0.8.nix
2.3.0.10.nix	haskell-network: added version 2.3.0.10	2012-02-03 19:06:44 +00:00