svn merge ^/nixpkgs/trunk

I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806

pkgs/development/tools/documentation/haddock/2.10.0.nix

@@ -0,0 +1,21 @@
+{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.10.0";
+  sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ Cabal filepath ghcPaths xhtml ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})