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
The new files ...
* conform to the coding guidelines,
* consistently specify meta.maintainers and meta.platforms,
* have proper descriptions and licenses as specified in their Cabal file, and
* take advantage of the new cabal.nix extensions, i.e. proper
distinction between buildInputs and propagatedBuildInputs.
Furthermore, the following updates were performed:
* haskell-Ranged-sets: updated to version 0.3.0
* haskell-Shellac-haskeline: updated to version 0.2.0.1
* haskell-cpphs: updated to version 1.12
* haskell-hslogger: updated to version 1.1.5
* haskell-xml: updated to version 1.3.9
* haskell-HDBC-postgresql: updated to version 2.3.2.0
* haskell-HDBC-sqlite3: updated to version 2.3.3.0
* haskell-HDBC: updated to version 2.3.1.0
* haskell-base-unicode-symbols: updated to version 0.2.2.1
* haskell-convertible: updated to version 1.0.11.0
* haskell-monad-control: updated to version 0.2.0.2
* haskell-murmur-hash: updated to version 0.1.0.4
* haskell-repa: updated to version 2.1.1.3
* haskell-statistics: updated to version 0.9.0.0
* haskell-ansi-terminal: updated to version 0.5.5
haskell-maybench was dropped, because it cannot be built with recent
versions of Cabal:
Configuring maybench-0.2.4.1...
Setup: At least the following dependencies are missing:
Cabal >=1.2 && <1.5
svn path=/nixpkgs/trunk/; revision=28446
Several changes, some highlights:
* Structure of haskell-packages.nix updated. It's now easier to
select different default versions of packages for different
versions of GHC.
* GHC 7.0.2 is now default.
* Haskell Platform 2011.2.0.0 has been added and is now default.
* Several packages have been updated
(gtk2hs, gitit, xmonad, darcs, ...).
* Some old packages have been removed.
svn path=/nixpkgs/trunk/; revision=26288
