nixpkgs/pkgs/development/tools
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
..
analysis * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
build-managers svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
cdecl
documentation State qt version (3/4) in packages, not in all-packages.nix 2012-01-07 17:06:49 +00:00
guile
haskell haskell-hlint: updated to version 1.8.23 2012-02-06 14:28:02 +00:00
java
literate-programming/noweb
misc svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
ocaml * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
parsing svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
profiling
pydb Moved python debugger into development/tools hierarchy. 2012-02-04 09:30:53 +00:00
selenium/remote-control * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00