nixpkgs/pkgs/top-level
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
..
all-packages.nix svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
guile-2-test.nix
haskell-packages.nix haskell-pandoc: updated to version 1.9.0.3 2012-02-06 18:28:19 +00:00
make-tarball.nix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
mingw.nix
perl-packages.nix Bumped JSON to 2.53 and JSON-XS to 2.32. The older versions doesn't seem to be located on these sites anymore 2012-01-18 16:19:25 +00:00
platforms.nix Fixing the kernel configuration for Fuloong2F. Specially with VGA_CONSOLE enabled, 2012-01-21 00:34:38 +00:00
python-packages.nix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
release-cross.nix release-cross: Add OpenSSL for cross-GNU builds. 2012-01-06 14:07:08 +00:00
release-lib.nix
release-small.nix release-small.nix: updated name of "dbus" attribute 2011-10-06 13:21:07 +00:00
release.nix * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs 2012-02-02 15:44:22 +00:00