Commit Graph

4 Commits

Author SHA1 Message Date
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
Peter Simons
37d2e2e917 gmp: renamed nix files to conform with coding guidelines
svn path=/nixpkgs/trunk/; revision=31903
2012-01-28 10:20:50 +00:00
Eelco Dolstra
97a6ecb879 * Incorrect filename: 4.3.2 -> 4.3.1
svn path=/nixpkgs/trunk/; revision=19869
2010-02-08 17:46:34 +00:00
Rob Vermaas
2bbb78ab94 use gmp 4.3.2 on i686-darwin
svn path=/nixpkgs/trunk/; revision=19864
2010-02-08 13:58:25 +00:00