nixpkgs-suyu/pkgs/applications/science
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
..
astronomy gravit: cosmetic 2011-11-08 10:01:14 +00:00
biology * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
chemistry/avogadro Fix compilation with qt-4.8 2012-01-14 18:03:41 +00:00
electronics * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
geometry * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
logic svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
math * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
misc State qt version (3/4) in packages, not in all-packages.nix 2012-01-07 17:06:49 +00:00