svn merge ^/nixpkgs/trunk

I need the latest KDE-related changes

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

14 files changed, 65 insertions, 57 deletions

diff --git a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
index de2cabf20e4f..ddffa48dc55b 100644
--- a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
@@ -1,4 +1,4 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies
+{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
 , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
 , kdepimlibs, libkexiv2, libqalculate, libXtst }:
 # TODO: qwt, scim
@@ -11,6 +11,8 @@ kde {
     attica python qca2 qimageblitz kdepimlibs
     libqalculate libXtst shared_desktop_ontologies marble libkexiv2];
 
+  buildNativeInputs = [ pkgconfig ];
+
   meta = {
     description = "KDE Plasma Addons";
     license = "GPL";
diff --git a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix
index de2cabf20e4f..9d70579d6d24 100644
--- a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix
@@ -1,6 +1,6 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies
+{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
 , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst }:
+, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt }:
 # TODO: qwt, scim
 
 kde {
@@ -8,9 +8,11 @@ kde {
   KDEDIRS=marble;
 
   buildInputs = [ kdelibs boost eigen kde_workspace
-    attica python qca2 qimageblitz kdepimlibs
+    attica python qca2 qimageblitz kdepimlibs libdbusmenu_qt
     libqalculate libXtst shared_desktop_ontologies marble libkexiv2];
 
+  buildNativeInputs = [ pkgconfig ];
+
   meta = {
     description = "KDE Plasma Addons";
     license = "GPL";
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 5cb04c80a45e..fec9600b0100 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, expat}:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.21";
+  name = "exiv2-0.22";
   
   src = fetchurl {
     url = "http://www.exiv2.org/${name}.tar.gz";
-    sha256 = "1r9phzb1h9v8smw1pix2k9lyr44n4nyba15x7qh45c0pwsjdf9yq";
+    sha256 = "0ynf4r4fqijaa9yb0wfddk0a151p8cbcqxab54dyhc1xk83saf6k";
   };
   
   propagatedBuildInputs = [zlib expat];
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
index 8ac9548d6104..a78d46541f74 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
@@ -1,15 +1,17 @@
-{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
+{ cabal, convertible, HDBC, mtl, parsec, postgresql, time
+, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "HDBC-postgresql";
-  version = "2.3.2.0";
-  sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs";
+  version = "2.3.2.1";
+  sha256 = "1ji10w4d91dp3ci7pn1jd8nb3wasszwlsy1lfbb4mqnr15c9vnpb";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ HDBC mtl parsec time utf8String ];
+  buildDepends = [ convertible HDBC mtl parsec time utf8String ];
   extraLibraries = [ postgresql ];
   meta = {
-    homepage = "http://software.complete.org/hdbc-postgresql";
+    homepage = "http://github.com/hdbc/hdbc-postgresql";
     description = "PostgreSQL driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 1ab60436f68a..1c8a1ca9120d 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.1.2";
-  sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh";
+  version = "0.10.1.3";
+  sha256 = "0r6gns729nfaxlig0sxlal5cx4ipyjk62zrmwn5i1i7lighp10y0";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 77cf2cf00e54..c6cf467d1f66 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "6.6.3";
-  sha256 = "0l1cv1syx1j8xvy5sjl6cj7l4zyizkmv6z8g038n8fwgsw130hm9";
+  version = "6.6.4";
+  sha256 = "1bdgazyrin7flfqi5ix8pp3ldisb101s4p8539h19xc8jw22x6sk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 4e032d452262..df16514e91fd 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,23 +1,23 @@
 { cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs
 , dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet
-, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
-, shakespeareCss, shakespeareJs, shakespeareText, text, time
-, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
-, yesodJson, yesodStatic
+, hledger, hledgerLib, httpEnumerator, HUnit, ioStorage, parsec
+, regexpr, safe, shakespeareCss, shakespeareJs, shakespeareText
+, text, time, tlsExtra, transformers, wai, waiExtra, warp, yesod
+, yesodCore, yesodForm, yesodJson, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.17";
-  sha256 = "1b5k76p27pvxc91gns3aimy3zcy6m366nnpwzbm214v6ka82imfi";
+  version = "0.17.1";
+  sha256 = "0cix0k2skbrcbjhj876cx4mizjvkqnr91s092a3lg4rv40dhgwa9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson blazeHtml cabalFileTh clientsession cmdargs dataObject
     dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib
-    HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs
-    shakespeareText text time transformers wai waiExtra warp yesod
-    yesodCore yesodForm yesodJson yesodStatic
+    httpEnumerator HUnit ioStorage parsec regexpr safe shakespeareCss
+    shakespeareJs shakespeareText text time tlsExtra transformers wai
+    waiExtra warp yesod yesodCore yesodForm yesodJson yesodStatic
   ];
   meta = {
     homepage = "http://hledger.org";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index d498aa6edd0a..4ddd53ba75a8 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.8.0.1";
-  sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi";
+  version = "0.8.0.2";
+  sha256 = "10v11fnx7dhj2gg09k3ji054iywbpazs789vhfxn56wfg6rz59wb";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
     monadControl mtl pathPieces poolConduit text time transformers
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index 56031ed31571..716bd99f43a1 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.5";
-  sha256 = "0d1baliykfpg15bzknx98slr0qa5yjr3va3w8hs02wgx6sp3wsy2";
+  version = "0.3.7";
+  sha256 = "0vjjpn3fq0s2assfg3p3wpk60jsrjp1f6i0djm3abdbmc53gqyi0";
   buildDepends = [ systemFilepath text time ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 056b8d53e652..778986d6a96d 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,16 +1,16 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
-, blazeBuilderConduit, conduit, dataDefault, failure
+, blazeBuilderConduit, conduit, dataDefault, failure, monadControl
 , systemFilepath, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.3";
-  sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc";
+  version = "0.5.3.1";
+  sha256 = "124c88x3ww1414c7s3wx7z1kqy37m9mwihiwyamgz25lg502n8gb";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    conduit dataDefault failure systemFilepath text transformers
-    xmlTypes
+    conduit dataDefault failure monadControl systemFilepath text
+    transformers xmlTypes
   ];
   meta = {
     homepage = "http://github.com/snoyberg/xml";
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index ca7e611e57b9..a9b60feff2f3 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libexif-0.6.19";
+  name = "libexif-0.6.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/libexif/${name}.tar.bz2";
-    sha256 = "1gfa07bzs2lk0n887f1lvz5b9a7abyc3f5zaf39w4sf23hk9axpr";
+    sha256 = "05fphfmgrni6838v0lkcqv88fbw7r1mdw3ypy3bh567vv05x4wm7";
   };
 
   buildInputs = [ gettext ];
diff --git a/pkgs/development/libraries/libexif/no-po.patch b/pkgs/development/libraries/libexif/no-po.patch
deleted file mode 100644
index 77e61236939a..000000000000
--- a/pkgs/development/libraries/libexif/no-po.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc libexif-0.6.14/Makefile.in libexif-0.6.14.new/Makefile.in
-*** libexif-0.6.14/Makefile.in	2007-05-10 17:14:58.000000000 +0200
---- libexif-0.6.14.new/Makefile.in	2007-05-13 23:04:05.000000000 +0200
-***************
-*** 224,230 ****
-  target_alias = @target_alias@
-  top_builddir = @top_builddir@
-  top_srcdir = @top_srcdir@
-! SUBDIRS = m4m po libexif test doc binary
-  @SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt
-  EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
-  ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
---- 224,230 ----
-  target_alias = @target_alias@
-  top_builddir = @top_builddir@
-  top_srcdir = @top_srcdir@
-! SUBDIRS = m4m libexif test binary
-  @SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt
-  EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
-  ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix
new file mode 100644
index 000000000000..a1510f58f7e1
--- /dev/null
+++ b/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
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 31d8ef454b8f..82f0fd366055 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -160,7 +160,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     cabalInstall = self.cabalInstall_0_10_2;    # 7.4.1 fails
     alex         = self.alex_3_0_1;             # 7.4.1 ok
     happy        = self.happy_1_18_9;           # 7.4.1 ok
-    haddock      = self.haddock_2_9_2;          # 7.4.1 fails
+    haddock      = self.haddock_2_10_0;         # 7.4.1 ok
   };
 
   haskellPlatformDefaults_future =
@@ -1563,7 +1563,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
   haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
-  haddock = self.haddock_2_9_4;
+  haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {};
+  haddock = self.haddock_2_10_0;
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
   happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};