Merge branch 'master' into x-updates

144 files changed, 665 insertions, 737 deletions

diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index dd7b6fcb2187c..dd8b68717aae3 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "GNU Aspell, A spell checker for many languages";
     homepage = http://aspell.net/;
     license = "LGPLv2+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 9c6c5b3f85af4..f62dc2004476d 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage    = http://avahi.org;
     license     = licenses.lgpl2Plus;
     platforms   = platforms.unix;
-    maintainers = with maintainers; [ lovek323 ludo ];
+    maintainers = with maintainers; [ lovek323 ];
 
     longDescription = ''
       Avahi is a system which facilitates service discovery on a local
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index c5ae776fe3ed6..73ea5254182d5 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)";
     homepage = http://www.gnu.org/software/ccrtp/;
     license = "GPLv2";
-    maintainers = with stdenv.lib.maintainers; [ marcweber ludo ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
new file mode 100644
index 0000000000000..2c712c5c20ed7
--- /dev/null
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, fftw, boost }:
+
+stdenv.mkDerivation rec {
+  name = "chromaprint-${version}";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
+    sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf";
+  };
+
+  buildInputs = [ cmake fftw boost ];
+
+  meta = {
+    homepage = "http://acoustid.org/chromaprint";
+    description = "AcoustID audio fingerprinting library";
+    license = stdenv.lib.licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index aa594a8e2bc17..2c723e2c8b24d 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
 
     /* Leads to an ICE on Cygwin:
 
diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
index bce5dd1b48941..00a4edd2a9884 100644
--- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix
+++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index d3878379027bd..5873244611170 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index b5aacad7bf096..33bc196143b10 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     license = "LGPLv2+";
     homepage = http://www.clutter-project.org/;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index f80d5813c3ed7..3b517d60b27f1 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = http://cryptopp.com/;
     license = "Boost 1.0";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix
index bee2042f11669..ef0a1d41bd685 100644
--- a/pkgs/development/libraries/gettext/0.17.nix
+++ b/pkgs/development/libraries/gettext/0.17.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/gettext/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix
index 8be076f335c02..eca215c3131ed 100644
--- a/pkgs/development/libraries/glibc/2.13/common.nix
+++ b/pkgs/development/libraries/glibc/2.13/common.nix
@@ -219,7 +219,7 @@ stdenv.mkDerivation ({
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     #platforms = stdenv.lib.platforms.linux;
   } // meta;
 }
diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index e0588a6275d62..66251e0fc49fe 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -8,6 +8,7 @@ cross:
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
 , profilingLibraries ? false, meta
+, withGd ? false, gd ? null, libpng ? null
 , preConfigure ? "", ... }@args:
 
 let
@@ -103,12 +104,13 @@ stdenv.mkDerivation ({
       # To avoid linking with -lgcc_s (dynamic link)
       # so the glibc does not depend on its compiler store path
       "libc_cv_as_needed=no"
-    ];
+    ] ++ stdenv.lib.optional withGd "--with-gd";
 
   installFlags = [ "sysconfdir=$(out)/etc" ];
 
   buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
-    ++ stdenv.lib.optional (mig != null) mig;
+    ++ stdenv.lib.optional (mig != null) mig
+    ++ stdenv.lib.optionals withGd [ gd libpng ];
 
   # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
   # prevent a retained dependency on the bootstrap tools in the stdenv-linux
@@ -125,7 +127,7 @@ stdenv.mkDerivation ({
 
 # Remove the `gccCross' attribute so that the *native* glibc store path
 # doesn't depend on whether `gccCross' is null or not.
-// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" ]) //
+// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" "withGd" "gd" "libpng" ]) //
 
 {
   name = name + "-${version}" +
@@ -188,6 +190,10 @@ stdenv.mkDerivation ({
   } // meta;
 }
 
+// stdenv.lib.optionalAttrs withGd {
+  preBuild = "unset NIX_DONT_SET_RPATH";
+}
+
 // stdenv.lib.optionalAttrs (hurdHeaders != null) {
   # Work around the fact that the configure snippet that looks for
   # <hurd/version.h> does not honor `--with-headers=$sysheaders' and that
diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix
index b6d91c932db8b..52a94bd0a0d5a 100644
--- a/pkgs/development/libraries/glibc/2.17/default.nix
+++ b/pkgs/development/libraries/glibc/2.17/default.nix
@@ -5,6 +5,7 @@
 , profilingLibraries ? false
 , gccCross ? null
 , debugSymbols ? false
+, withGd ? false, gd ? null, libpng ? null
 }:
 
 assert stdenv.gcc.gcc != null;
@@ -16,10 +17,11 @@ in
   build cross ({
     name = "glibc"
       + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
-      + stdenv.lib.optionalString debugSymbols "-debug";
+      + stdenv.lib.optionalString debugSymbols "-debug"
+      + stdenv.lib.optionalString withGd "-gd";
 
     inherit fetchurl fetchgit stdenv kernelHeaders installLocales
-      profilingLibraries gccCross;
+      profilingLibraries gccCross withGd gd libpng;
 
     builder = ./builder.sh;
 
diff --git a/pkgs/development/libraries/gmp/5.1.1.nix b/pkgs/development/libraries/gmp/5.1.1.nix
index 0261f833962e0..1f43e07e58d51 100644
--- a/pkgs/development/libraries/gmp/5.1.1.nix
+++ b/pkgs/development/libraries/gmp/5.1.1.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
       '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
index 85a676a05b1fd..86829a3a44b7f 100644
--- a/pkgs/development/libraries/gnutls/2.12.nix
+++ b/pkgs/development/libraries/gnutls/2.12.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index df6a67b9731b7..0a98a2698fd96 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (rec {
 
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
-    maintainers = [ maintainers.ludo ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 14da5f3468b4e..016b340c51f20 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 3b52133058f1a..a4a3a01299c08 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/gsasl/;
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ bjg ludo ];
+    maintainers = with stdenv.lib.maintainers; [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 474d2f97dd0ef..49364f882429b 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/gsl/;
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index eb2335dac43b0..17dc5469910fd 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index 64943d5e1c1cd..bbb145fd8bf82 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -5,18 +5,19 @@ cabal.mkDerivation (self: {
   version = "0.2.4.1";
   sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k";
   extraLibraries = [ fuse ];
-
   preConfigure = ''
     sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
+    sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc
+    sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc
+    sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc
+    sed -i -e "s/IO.catch/ E.catch/" System/Fuse.hsc
+    sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc
   '';
-
   meta = {
     homepage = "https://github.com/toothbrush/hfuse";
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 659a1158d0f3c..b87c47f04beda 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -1,16 +1,19 @@
-{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
-, regexCompat, time
+{ cabal, filepath, hslogger, HUnit, mtl, network, parsec
+, QuickCheck, random, regexCompat, testpack, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "MissingH";
-  version = "1.2.0.0";
-  sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1";
-  isLibrary = true;
-  isExecutable = true;
+  version = "1.2.0.1";
+  sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m";
   buildDepends = [
     filepath hslogger HUnit mtl network parsec random regexCompat time
   ];
+  testDepends = [
+    filepath hslogger HUnit mtl network parsec QuickCheck random
+    regexCompat testpack time
+  ];
+  doCheck = false;
   meta = {
     homepage = "http://software.complete.org/missingh";
     description = "Large utility library";
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index 2dead8de40d4a..9018bc603cf42 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.1.10";
-  sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs";
+  version = "0.1.11";
+  sha256 = "107f3ch84riagxa9x6yk4gxq2vq5dsk63rd0780g1fdplnf1sky3";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";
diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
index 23994140d6c05..8bdf30e36d192 100644
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bindings-posix";
-  version = "1.2.3";
-  sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
+  version = "1.2.6";
+  sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
   buildDepends = [ bindingsDSL ];
   meta = {
     description = "Low level bindings to posix";
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 6ad4db61cfdcf..90fb53051e230 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "c2hs";
-  version = "0.16.4";
-  sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi";
+  version = "0.16.5";
+  sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath languageC ];
   meta = {
-    homepage = "http://www.cse.unsw.edu.au/~chak/haskell/c2hs/";
+    homepage = "https://github.com/haskell/c2hs";
     description = "C->Haskell FFI tool that gives some cross-language type safety";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index e670ff1a3d14e..6cb8d26bd39a9 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.9";
-  sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308";
+  version = "0.9.0.2";
+  sha256 = "0vl310nickavp8wkaad1wfnvm8gfsg9jcfw3rgjz7698avynv3ni";
   buildDepends = [
     base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
     tagged
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index 23fdd553f9e73..aa786fa978401 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.12.2.1";
-  sha256 = "03hbjjrwnpa4ji2ig458s0c4g13r566sl6fs3hciwyf6cfq597wk";
+  version = "0.12.2.2";
+  sha256 = "0qmv8vizrbjs3k2f78r6ykyilps4zp7xxpzdxw7rngh154wqgv1k";
   buildDepends = [ cereal entropy tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/crypto-api";
diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
new file mode 100644
index 0000000000000..3e93912b3a7b6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
@@ -0,0 +1,24 @@
+{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck
+, securemem, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-tests";
+  version = "0.0.2";
+  sha256 = "1jzci2a6827jgiklj8sh7pjl7g4igk2j6mim20619i4rk6x0lhgz";
+  buildDepends = [
+    byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  testDepends = [
+    byteable cryptoCipherTypes HUnit mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher tests";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
new file mode 100644
index 0000000000000..378ccf3dbcc2a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
@@ -0,0 +1,14 @@
+{ cabal, byteable, securemem }:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-types";
+  version = "0.0.2";
+  sha256 = "1vjf9g1w7ja8x42k6hq6pcw7jvviw9rq512ncdqd7j20411zjbf4";
+  buildDepends = [ byteable securemem ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 50935a77a64e2..6efca94a65174 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.5.0";
-  sha256 = "16gqsy23y3g9089ng94124g5pvc4d0vnh2r47ii789f8j96062nd";
+  version = "0.5.1";
+  sha256 = "118sabi90qjyqbvfincn737c4mi9mvjij1dzx7k9rsgad47p0753";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
     testFrameworkQuickcheck2 vector
   ];
   meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptocipher";
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
     description = "Symmetrical block and stream ciphers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index bc2abf5c16d51..a73b6d9fba85d 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "0.6";
-  sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil";
+  version = "0.7";
+  sha256 = "14ghcrzzpqdnvmpvykhf4r74sb9jgp69094mkwydslzmi8dsgdiy";
   buildDepends = [
     cairo cmdargs colour diagramsCore diagramsLib filepath mtl split
     time
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 141a820b5d1a9..023ac0906814a 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.1";
-  sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi";
+  version = "0.7";
+  sha256 = "0dcj4rjvpgf0lmxgv50f8cpi6adkbfnsa4z4ay8khawhnn4af5ac";
   buildDepends = [
     arithmoi circlePacking colour dataDefault diagramsCore diagramsLib
     forceLayout lens MonadRandom mtl split vectorSpace
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index ed23b092b02ec..c2dbb27aebd15 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "0.6.0.2";
-  sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85";
+  version = "0.7";
+  sha256 = "00ba31imq91w6lzy8blgxawr06igrjfrg4adrqy650wip8jafqwq";
   buildDepends = [
     dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 6f201e7cd850d..84d3d9bbf48cf 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "0.6";
-  sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh";
+  version = "0.7";
+  sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 73c7ff8f8c477..50afb16f2823f 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -1,14 +1,15 @@
-{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras
-, newtype, NumInstances, semigroups, vectorSpace
+{ cabal, active, colour, dataDefaultClass, diagramsCore, fingertree
+, intervals, monoidExtras, newtype, NumInstances, semigroups
+, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "0.6.0.3";
-  sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1";
+  version = "0.7";
+  sha256 = "02zb9j2qb5f26azscv1m4iivp1ixdhx6rcjns5smka1hdgyzld1j";
   buildDepends = [
-    active colour dataDefault diagramsCore monoidExtras newtype
-    NumInstances semigroups vectorSpace
+    active colour dataDefaultClass diagramsCore fingertree intervals
+    monoidExtras newtype NumInstances semigroups vectorSpace
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 561f32118c229..644037e946ee4 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "0.6.0.1";
-  sha256 = "0x4yjm1wdhicknls1y3fhdg89m8wcvfk2svabww9075w6ras79qk";
+  version = "0.7";
+  sha256 = "0vfykrx29dxii9mdjjkia5a42jfg4hbzgxzv5rp7zvf3fz9w8w1x";
   buildDepends = [
     blazeSvg cmdargs colour diagramsCore diagramsLib filepath
     monoidExtras mtl split time vectorSpace
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index e4756eeb2dd90..e80f4379aa731 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "0.3.7";
-  sha256 = "1wly3h36j9gjyx6p2vzand5019m6rs0qkcf1h4q61igks65xs674";
+  version = "0.3.8";
+  sha256 = "1x2rfm89qpx7dpxr457i2wqmjry8r28f42j194131mfx4gc4mwdq";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit iproute
     mtl network networkConduit random
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 797ce1711b2b2..17409f05eed53 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.2.2.1";
-  sha256 = "1yl1gmkmbalm27pjlpm9nhsbxpvxl8w7p8psq5apyrbdqnv9yhbg";
+  version = "0.2.2.2";
+  sha256 = "1xkpfi6njj5iqwn5wa6npyzxksj9hr0xqbxrslg646whxrkd8718";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index b192c1e0c61e8..fb8714f3e8543 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "0.3.2";
-  sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla";
+  version = "0.3.3";
+  sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh";
   buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
   testDepends = [ hspec ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index bafe23aed0c02..a2c1ccde86bc2 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "feed";
-  version = "0.3.9";
-  sha256 = "0waqy8ssmbfpqy21svvbnm0igrjxbgd2i093hbl5chim6yraapv2";
+  version = "0.3.9.1";
+  sha256 = "1c7dj9w9qj8408qql1kfq8m28fwvfd7bpgkj32lmk5x9qm5iz04k";
   buildDepends = [ utf8String xml ];
   meta = {
+    homepage = "https://github.com/sof/feed";
     description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index 043156ab5e1fe..f1a1ec837fd48 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.5.0";
-  sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
+  version = "1.6.1";
+  sha256 = "0c3b3xkjdfp14w48gfk3f6aqz4cgk6i3bl5mci23mbb3f33jcx1j";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 62b07030a4606..679ced622d9b3 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -5,6 +5,10 @@ cabal.mkDerivation (self: {
   version = "0.5.1";
   sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
   buildDepends = [ binary transformers ];
+  postInstall = ''
+    ensureDir "$out/share/ghci"
+    ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+  '';
   meta = {
     description = "Extract the heap representation of Haskell values and thunks";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index fe0602bf888f4..93230af441186 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -19,13 +19,13 @@ cabal.mkDerivation (self: {
   buildTools = [ emacs ];
   doCheck = false;
   postInstall = ''
-      cd $out/share/$pname-$version
-      make
-      rm Makefile
-      cd ..
-      ensureDir "$out/share/emacs"
-      mv $pname-$version emacs/site-lisp
-    '';
+    cd $out/share/$pname-$version
+    make
+    rm Makefile
+    cd ..
+    ensureDir "$out/share/emacs"
+    mv $pname-$version emacs/site-lisp
+  '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell Programming";
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 856ec8104631c..04af52f26790b 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -10,6 +10,10 @@ cabal.mkDerivation (self: {
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot
   ];
+  postInstall = ''
+    ensureDir "$out/share/ghci"
+    ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+  '';
   meta = {
     homepage = "http://felsin9.de/nnis/ghc-vis";
     description = "Live visualization of data structures in GHCi";
diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 78711cc7c4490..511b1b70f2893 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.7.0";
-  sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p";
+  version = "0.7.1";
+  sha256 = "0aipaamd7gn5f79f451v8ifjs5g8b40g9w4kvi1i62imsh0zhh90";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
     httpConduit httpTypes network text time unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index a5984aef77c8b..f397a60017fbf 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.8.4";
-  sha256 = "06m90n0gxjhfdl2jalwzwsbgdg854bqw1qygkxbcfcknrpd2ampk";
+  version = "1.8.0.1";
+  sha256 = "17nnmv84pjls1my58yzifbin3pxcnlbpkprglad707rr4lrkkjvv";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 766f56ee8e33d..f3f2562a07357 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.3.1.0";
-  sha256 = "1cx5pf0wf49cylbcgy1di218qk0fw8rgzqri9lx1v8jfl31zvsg5";
+  version = "4.3.3.0";
+  sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index 15d32de346df0..c864c7e0a5ff5 100644
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hastache";
-  version = "0.5.0";
-  sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8";
+  version = "0.5.1";
+  sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
   buildDepends = [
     blazeBuilder filepath ieee754 mtl syb text transformers utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index eda7e1ff85962..0ccdb3c529ed5 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.15.0.0";
-  sha256 = "1n3m36kkgxhhmm7cmz4is9q558dw3l5h1laxnxwhs3cfdzfclyfs";
+  version = "0.15.0.1";
+  sha256 = "0hm3jnh7lds74zyk2m8i3zcdmsv1jlvplrzlxxr68j1cqwfdxilg";
   buildDepends = [ binary deepseq random storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 1e0c9275a2475..374dd9eaf6774 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.6.1";
-  sha256 = "089j6dpl856q3m1wyc7n822k7vppzb7pxdcwvzbhck2cadad3zn5";
+  version = "1.7.0";
+  sha256 = "0a1s7pkymn41kk8gp5i7v141vq5yx857rma1l2xffs9lh4qalnq8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 7b06ea9c21c62..d7925b41816aa 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.6.1";
-  sha256 = "16gwzc5x04kj7847w4nw0msj7myk22hlfkpal9dcpdvslzzy44nh";
+  version = "1.7.0";
+  sha256 = "0cw24vmns06z5308wva9bb5czs9i5wm6qdhymgiyl2i47ibxp5bj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index d1cff617a82c4..f6a06e3351561 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.4.1";
-  sha256 = "181irzldrr554naq2yvs0yzmkkfk26n59snrsmxhr79d9kdp73l4";
+  version = "1.9.4.2";
+  sha256 = "13qjf3c3qkaqdi7qp1iqywvsbsiqq8brbzwh8idaj1bhl9jizwhx";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
index 86605ae55a56c..500ed43078357 100644
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-charproperties";
-  version = "9.1.1";
-  sha256 = "14xv0q1hh0k8lgispc4fa49cvyg9s7936kp42vr9b0pyd1q4zid8";
+  version = "9.1.1.1";
+  sha256 = "1a8cmswqysd0fpq6bpszav5cqpibnad49mbcswvrwipk28x3j078";
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
     description = "Character properties and classes for XML and Unicode";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
index 731c63b5378b9..fbe402cea5fd0 100644
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-unicode";
-  version = "9.0.2";
-  sha256 = "1ri3198j0bavgam861yiiisl43rh4pbkmji7g6v3jnnch7834hdd";
+  version = "9.0.2.1";
+  sha256 = "1ng3qaiwkaav1kmf0yxkm44887xphbx6slva3fskzx0sgkd1v0vp";
   buildDepends = [ hxtCharproperties ];
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
     description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
new file mode 100644
index 0000000000000..3cc44b05dbb52
--- /dev/null
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@@ -0,0 +1,14 @@
+{ cabal, numericExtras }:
+
+cabal.mkDerivation (self: {
+  pname = "intervals";
+  version = "0.2.2";
+  sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q";
+  buildDepends = [ numericExtras ];
+  meta = {
+    homepage = "http://github.com/ekmett/intervals";
+    description = "Interval Arithmetic";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
deleted file mode 100644
index 154bc68c3c5ca..0000000000000
--- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, alex, filepath, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "language-c";
-  version = "0.3.2.1";
-  sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx";
-  buildDepends = [ filepath syb ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://www.sivity.net/projects/language.c/";
-    description = "Analysis and generation of C code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/default.nix
index 5b638ea9dab49..5b638ea9dab49 100644
--- a/pkgs/development/libraries/haskell/language-c/0.4.2.nix
+++ b/pkgs/development/libraries/haskell/language-c/default.nix
diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix
index aad46d4e01796..13054c0714df5 100644
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-java";
-  version = "0.2.5.1";
-  sha256 = "06jzski25840jk3775ia7nx11mjkyp9cmmb7y81djcndliblbyhc";
+  version = "0.2.5";
+  sha256 = "1l3q156m3l3fawsrgj3fr16qxr0apwg2si410j0f5hsgfmkhdrm6";
   buildDepends = [ cpphs parsec syb ];
   testDepends = [
     filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
   buildTools = [ alex ];
   doCheck = false;
   meta = {
-    homepage = "http://github.com/jkoppel/language-java";
+    homepage = "http://github.com/vincenthz/language-java";
     description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 4531603214e0d..8bc221f14933b 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
     transformers unorderedContainers vector
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal
+  '';
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 4e98aa82bc2d1..83f87f7c8b5d5 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -1,18 +1,14 @@
-{ cabal, aeson, attoparsec, cereal, contravariant, cryptoApi
-, httpConduit, httpTypes, HUnit, network, pureMD5, testFramework
-, testFrameworkHunit, text, void
+{ cabal, aeson, cereal, contravariant, cryptoApi, httpConduit
+, httpTypes, network, pureMD5, semigroups, text, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.2.0.0";
-  sha256 = "1x147mry8pq8qzrhrsbxm4b7sb80c9900kq2igwvcskwszd5h56n";
+  version = "0.3.0.0";
+  sha256 = "131p51yi17qfgk8h5b0rx2jyl37w4spafxmlcws1s5pk6bwy75jf";
   buildDepends = [
     aeson cereal contravariant cryptoApi httpConduit httpTypes network
-    pureMD5 text void
-  ];
-  testDepends = [
-    aeson attoparsec HUnit testFramework testFrameworkHunit text
+    pureMD5 semigroups text void
   ];
   meta = {
     description = "Lastfm API interface";
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 0a03ed45fee66..9dc4b58797f18 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "logict";
-  version = "0.6";
-  sha256 = "1np4wizvwlx458kq6mmdrh8qcp1794y1bs4mnnz951h6hay5z49f";
+  version = "0.6.0.1";
+  sha256 = "0sznrnx7l5sqnyvc2xwx1q33b4833qsnhppm06a3scp9gj3y1xp2";
   buildDepends = [ mtl ];
   meta = {
     homepage = "http://code.haskell.org/~dolio/logict";
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 5b21949d5faf0..691029ac5de2f 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.2";
-  sha256 = "1v9qdj53swhg8xg9s2x0m6d6xaff5ya6bpdifya2vsp08fmgn4l9";
+  version = "0.4.2.1";
+  sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
-  testDepends = [ blazeBuilder hspec ];
+  testDepends = [ blazeBuilder hspec text ];
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";
diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
new file mode 100644
index 0000000000000..c4a77630e6aee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "modular-arithmetic";
+  version = "1.0.1.1";
+  sha256 = "14n83kjmz8mqjivjhwxk1zckms5z3gn77yq2hsw2yybzff2vkdkd";
+  meta = {
+    description = "A type for integers modulo some constant";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix
index 22b9d359faf27..d682908dcf18f 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4.3";
-  sha256 = "1yf1s44r2mkqimi26g9y4zxqgs4yizfmigfx9mkfgbqsn2a8sff6";
+  version = "0.3.4.4";
+  sha256 = "0mqvrg2izqjrgzbmr6pcl9v9827fkr4mwxpdckm3gj1miljsj314";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index e955bb14a727e..60236eaad355a 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.5.2";
-  sha256 = "0a0qx331c1kvhmwwam7pbbrnq8ky3spfnw6zsz6rz7g1lk1hfawn";
+  version = "0.5.3";
+  sha256 = "1nmkya9mf9y6lhmbhamq2g09pfvfpmicrwab09mcy3ggljdnnfyg";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index a0ba1fd9856ef..969ab8bd0b805 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.2.2.3";
-  sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
+  version = "0.3.0.0";
+  sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087";
   buildDepends = [ semigroups ];
   meta = {
     description = "Various extra monoid-related definitions and utilities";
diff --git a/pkgs/development/libraries/haskell/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix
index f965caf2c1e95..f4b3b4a78edbe 100644
--- a/pkgs/development/libraries/haskell/mueval/default.nix
+++ b/pkgs/development/libraries/haskell/mueval/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mueval";
-  version = "0.9";
-  sha256 = "1y6n3zvdlzxl5hi1raz7ac6fgy9321ilka3g2pk7p1ss9d10k8pb";
+  version = "0.9.1";
+  sha256 = "1f668z7rpdj2m239f5i54v7kd7wsvx3qvvhwyiavf28cmk32mxpq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index d636ea7b542d9..77c81362d244a 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.16.0.0";
-  sha256 = "086mnhbp1d3n0xdn4cdlyrkkgrykg4bwhi7sbfdmn688qhpl3g9m";
+  version = "0.18.0.0";
+  sha256 = "1wgnpsnzjsspjvg5srjrzr4mqxhyisidkjj26cangxlhmb88rlwi";
   buildDepends = [ explicitException utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
new file mode 100644
index 0000000000000..c98f711f29715
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ncurses/default.nix
@@ -0,0 +1,22 @@
+{ cabal, c2hs, ncurses, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "ncurses";
+  version = "0.2.4";
+  sha256 = "0d4h85qgva1sf59g55k9xidqdpw18qj51xj7w5cqsf5pcpxgkcwh";
+  buildDepends = [ text transformers ];
+  buildTools = [ c2hs ];
+  extraLibraries = [ ncurses ];
+  preConfigure = ''
+    sed -i -e "s,ncursesw/,," lib/UI/NCurses.chs
+    sed -i -e "s,ncursesw/,," lib/UI/NCurses/Enums.chs
+    sed -i -e "s,ncursesw/,," lib/UI/NCurses/Panel.chs
+    sed -i -e "s,ncursesw/,," cbits/hsncurses-shim.c
+  '';
+  meta = {
+    homepage = "https://john-millikin.com/software/haskell-ncurses/";
+    description = "Modernised bindings to GNU ncurses";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 2785f9c5ab117..2b1a569404478 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.0.3";
-  sha256 = "0gaws4spd50dmqjsxdxvjk5n5l0ib4q0brwnxrk725d3b3hanpz1";
+  version = "1.0.1";
+  sha256 = "0h2svqllm85vambssq0j4ghx2b44cjg0kj04bamp72ly22mcg9d6";
   buildDepends = [
     aeson certificate conduit cryptoApi cryptoRandomApi network
     networkConduit pem systemFileio systemFilepath tls tlsExtra
diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix
new file mode 100644
index 0000000000000..76783dceb4940
--- /dev/null
+++ b/pkgs/development/libraries/haskell/numeric-extras/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "numeric-extras";
+  version = "0.0.3";
+  sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
+  meta = {
+    homepage = "http://github.com/ekmett/numeric-extras";
+    description = "Useful tools from the C standard library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index f6f4d420e2ab3..9fb5d334a4d5e 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numeric-prelude";
-  version = "0.4.0.1";
-  sha256 = "1j361gj7cw31x31vnjhxmy7a62ldvyyqfm7irhff7sf5gv4kr5wh";
+  version = "0.4.0.3";
+  sha256 = "0lgjnkvbz14cqsm5fjafl8g5mkclcdvpwa3kpz9radmg2x09rsnl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
     description = "An experimental alternative hierarchy of numeric type classes";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
new file mode 100644
index 0000000000000..2a86ebb722979
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
@@ -0,0 +1,14 @@
+{ cabal, enumerator, pcap, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pcap-enumerator";
+  version = "0.4";
+  sha256 = "0ka2n7740s02marvd1b11mrxc663kj0zcn7hksl5i13ls026hpb8";
+  buildDepends = [ enumerator pcap transformers ];
+  meta = {
+    homepage = "http://github.com/cutsea110/pcap-enumerator";
+    description = "Convert a pcap into an enumerator";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pcap/default.nix b/pkgs/development/libraries/haskell/pcap/default.nix
new file mode 100644
index 0000000000000..876905a4a5abd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pcap/default.nix
@@ -0,0 +1,15 @@
+{ cabal, libpcap, network, time }:
+
+cabal.mkDerivation (self: {
+  pname = "pcap";
+  version = "0.4.5.2";
+  sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
+  buildDepends = [ network time ];
+  extraLibraries = [ libpcap ];
+  meta = {
+    homepage = "https://github.com/bos/pcap";
+    description = "A system-independent interface for user-level packet capture";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 7ccbe145d7088..a336ab4fb8860 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.2.2.0";
-  sha256 = "18p3yz683ks0gdn1l4qys29jj7iqhlwh7i0s50bkl4x1w0mpa1kh";
+  version = "1.2.3.0";
+  sha256 = "0bil1932rnh3my9yjyc4sk24g0qwkkgv8b48nrn7fm007vyf173m";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 1ae1737e4b259..2b99bb2eb6c5b 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.4.0";
-  sha256 = "1xqs5hpljsapgisr7q3yd8ir351196xrdrk51dsizvk4vcs85wgs";
+  version = "0.3.5.0";
+  sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
     transformers vector
diff --git a/pkgs/development/libraries/haskell/pretty-show/1.5.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix
index 5fedd0aca292b..dc31b452a1bbb 100644
--- a/pkgs/development/libraries/haskell/pretty-show/1.5.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pretty-show";
-  version = "1.5";
-  sha256 = "1n04f9aypgbhkq0lbji9czv1mjfwv4f80w1c6hqs55gmzwif63m4";
+  version = "1.6.1";
+  sha256 = "17zdljvpf7ra9x3lny5kbjvmz3psn8y1k9cwbg97m017gh87gsh0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellLexer ];
diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index 0094ec5a340de..6844bcc369a6f 100644
--- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix
+++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctor-extras";
-  version = "3.3.1";
-  sha256 = "0z3lip0mjw0xyf516shdrnkkp9h53wglz6sjjqagpjj2viyqkprb";
+  version = "3.3.3.1";
+  sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g";
   buildDepends = [
     comonad profunctors semigroupoidExtras semigroupoids tagged
     transformers
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 8d1ee0ffc9593..0bf7747d46bfb 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.7.1.2";
-  sha256 = "1x4ln3dr937va0ii7lr86d6wsrh2qd1sxany4y9dkpcrsvb3db0l";
+  version = "0.7.1.3";
+  sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb";
   buildDepends = [ hashable transformers unorderedContainers vault ];
   testDepends = [
     hashable HUnit testFramework testFrameworkHunit transformers
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index acf9dc712f35d..2ec3fb3172e00 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-algorithms";
-  version = "3.2.3.1";
-  sha256 = "12w76npa52g7zxa0j9w8q9njacm2dn0hcd8a8386p9r6iy6lpjwc";
+  version = "3.2.4.1";
+  sha256 = "0xb2r726z73ghiqik39n99q5hal16y7ydk16q2rbycbvc37yq24b";
   buildDepends = [ repa vector ];
   extraLibraries = [ llvm ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 4b2defc79d718..3887abad71c72 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.7.1";
-  sha256 = "1x9njf5amxv04fvn7fsgpagvzl09sl6bnnx686i554frg66b2azh";
+  version = "0.4.7.2";
+  sha256 = "0gchdip4srilgqwxdzlamplwqsyrn4df0m72i8pjqpk7zwn96q1w";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix
new file mode 100644
index 0000000000000..cc0314705939b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/securemem/default.nix
@@ -0,0 +1,14 @@
+{ cabal, byteable }:
+
+cabal.mkDerivation (self: {
+  pname = "securemem";
+  version = "0.1.2";
+  sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh";
+  buildDepends = [ byteable ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-securemem";
+    description = "abstraction to an auto scrubbing and const time eq, memory chunk";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 16ad7ffa44a60..4864adfe83a8f 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.5";
-  sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf";
+  version = "1.0.5.1";
+  sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 3db59020b1546..4a89019906f99 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/meteficha/skein";
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 79171aefb9f8e..a2da329121b33 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -1,13 +1,15 @@
-{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, transformers
+{ cabal, async, conduit, HUnit, monadControl, QuickCheck, resourcet
+, stm, stmChans, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.1.0";
-  sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l";
-  buildDepends = [ conduit resourcet stm stmChans transformers ];
+  version = "2.1.2";
+  sha256 = "1jkjnp1sjb4sqs6zkmmlm0s1126fkh54jkhwxairdwaxx9yh9y9k";
+  buildDepends = [
+    async conduit monadControl resourcet stm stmChans transformers
+  ];
   testDepends = [
     conduit HUnit QuickCheck stm stmChans testFramework
     testFrameworkHunit testFrameworkQuickcheck2 transformers
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 1d2cea756ffb8..5c1059e634c80 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.6.1";
-  sha256 = "0fxncnl9bvb7qjha3r06qli9qlzfljism6k688hrr9y6l06jdc2c";
+  version = "0.5.7.0";
+  sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index baf9703b161b3..ee808800c55fc 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.6.1";
-  sha256 = "1n3m1y06lhbsx9rfwwdx5xqnw4ni41b39iyysgj5894iz9rwrrnv";
+  version = "0.7";
+  sha256 = "1g78hl6sib1mhg016gy3fqw78x72jsgqizsgim8a1pysjzq0y6zm";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 8082e77d2824a..ec8ccd01054a6 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.1.5";
-  sha256 = "15cxki04khq29m9h5wxzxgppc3r58ccp2hgsslp2g1f59x2wm348";
+  version = "0.6.3";
+  sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index b53b948c41d7f..55b2582017c54 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     certificate cipherAes cipherRc4 cryptohash cryptoPubkey
     cryptoRandomApi mtl network pem text time tls vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/vincenthz/hs-tls";
     description = "TLS extra default values and helpers";
diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix
new file mode 100644
index 0000000000000..b50713d5291e4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/union-find/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "union-find";
+  version = "0.2";
+  sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/nominolo/union-find";
+    description = "Efficient union and equivalence testing of sets";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index 8519ff451b2ef..8b0825ea119c6 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uniplate";
-  version = "1.6.10";
-  sha256 = "0j0hsvlkml8v9f8iijcgq58qnxnmk7gzxcnl9rxx4fdr9fnaffj3";
+  version = "1.6.11";
+  sha256 = "10ppc9hqc0y17r3y4vdajshrp3956dybna7qa5zm0akgl3pbla9j";
   buildDepends = [ hashable syb unorderedContainers ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/uniplate/";
diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
new file mode 100644
index 0000000000000..49022b12a29d1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "unix-bytestring";
+  version = "0.3.6";
+  sha256 = "0m2ndw6r88vb4cqdkd8jg8dlk9h99mp3rand5j1gxxdjfv7q63ap";
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Unix/Posix-specific functions for ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index 8dc93c21363b9..1f04d939d9c1a 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.1.2";
-  sha256 = "1gg1ynqd8hka5ynpmpsj8qw0lqsyg7l1m1py05iw3bd3cldwflx1";
+  version = "0.2.2";
+  sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6";
   buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 691787e7f87ce..846e3d8888370 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.1.10";
-  sha256 = "0z8i02j295fi0y512bwhxfk2dr2s4i0xlgi80pnq680zdrahgwlf";
+  version = "0.2.0";
+  sha256 = "1gmchi6crbd3lpnw1j0zaaj7y0gib8dbqd8ip2s5p3f50qqlsxj8";
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
     description = "Unix time parser/formatter and utilities";
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 3192def654e54..270ca004c4913 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.4.2";
-  sha256 = "14mrvh3av6dn4jx5q06b4lyjw8sr1ynygbncf5fbp3nzn8nmh17s";
+  version = "1.3.4.3";
+  sha256 = "19vj47awkazn6h4kf37f4sp4g8lhm125wjqnp1wa1wa8zlndp8wy";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault dateCache fastLogger httpTypes
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 91f51a76e2acd..2134077e61ab2 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.9";
-  sha256 = "1gnsikk1z5q1mblwshg9pbaa1ijy64da7vscanzp70lw63jjk7cg";
+  version = "1.3.9.1";
+  sha256 = "0s8jrgn9pxqkjvdbgvrxd0bnclkhn3hix2mff66hqpx8x4znh0zv";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpAttoparsec httpTypes liftedBase network networkConduit
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 98166f80d31bb..bd21eee5aa953 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,17 +1,17 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
 , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault
-, failure, hspec, HUnit, monadControl, resourcet, systemFilepath
-, text, transformers, xmlTypes
+, deepseq, failure, hspec, HUnit, monadControl, resourcet
+, systemFilepath, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.1.0.5";
-  sha256 = "1ryiacx42hdh564zy6dj5vxxl2l8flfffmdw8shb32w3gp11fzmp";
+  version = "1.1.0.6";
+  sha256 = "08kz982c95hcni6zbrflv8kqvy7wccb19plsmwczhzcsifam5a9k";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    blazeHtml blazeMarkup conduit dataDefault failure monadControl
-    resourcet systemFilepath text transformers xmlTypes
+    blazeHtml blazeMarkup conduit dataDefault deepseq failure
+    monadControl resourcet systemFilepath text transformers xmlTypes
   ];
   testDepends = [
     blazeMarkup conduit hspec HUnit text transformers xmlTypes
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index ee8b28b94cba8..1e22f1ae4bac6 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.4";
-  sha256 = "0kdqhdiyy2mqc3rb3l7aaspalkj4z8jndyzhij8m06n43hfzbhhi";
+  version = "0.8.4.1";
+  sha256 = "0zbnyf5hp206ywqkdd7c1hsdbn4wxwk7p3rzn53m7rzxvfshlbbx";
   buildDepends = [
     aeson attoparsec conduit resourcet text transformers
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 3327dc1c08cda..66ed9df2d20cd 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,20 +1,20 @@
 { cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault
 , emailValidate, fileEmbed, hamlet, httpConduit, httpTypes
 , liftedBase, mimeMail, network, persistent, persistentTemplate
-, pureMD5, pwstoreFast, random, resourcet, SHA, shakespeareCss
-, shakespeareJs, text, transformers, unorderedContainers, wai
-, yesodCore, yesodForm, yesodPersistent
+, pureMD5, pwstoreFast, random, resourcet, safe, SHA
+, shakespeareCss, shakespeareJs, text, time, transformers
+, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.0.2";
-  sha256 = "1vimv1zcpq167nd8fa3y0mrrwh1hqh2rqwmz5mg9zvqzz95wvhmh";
+  version = "1.2.1";
+  sha256 = "0xvb2v1c7zih4r1acd21s0fl18ygcajry5w6yiqqhnhx8wcniiqv";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
     persistent persistentTemplate pureMD5 pwstoreFast random resourcet
-    SHA shakespeareCss shakespeareJs text transformers
+    safe SHA shakespeareCss shakespeareJs text time transformers
     unorderedContainers wai yesodCore yesodForm yesodPersistent
   ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index a7925e82b1079..3dfedd471fecc 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.2";
-  sha256 = "03c53kgiqmjjihszmvqjgkcklq28mvyn4m2lhcbmqqzkkzyjb0rj";
+  version = "1.2.2.1";
+  sha256 = "0m68wm46qh8bwaccq2y8l4hh4xby0kczvhgd7caaxhmv6j3srrf2";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index c725ef53d3dc5..3fcec1a7d9fb1 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.3";
-  sha256 = "0b7rs5w7s88mv2mwg778dpkvcdwawq10i9r176fqi321g3170iwk";
+  version = "1.2.4";
+  sha256 = "0vgxspdxdjfdfgyx20lp460np7v1qjv6wzw95kj5cb5yiqv1nr9d";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index d41dcb64b1fc6..926cba46499f5 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.0.1";
-  sha256 = "02qkx148yx7dm059h05xrrahsifckcjwgcfxfq1kjdiik45j7xiz";
+  version = "1.3.1";
+  sha256 = "0zkwpymxwxca2p8i0fhq58wq7ic0dlyc3z89ypqglnp6h2mv2lwx";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index f32e90dab1794..c4ad5b29acdc5 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.0";
-  sha256 = "184hfhp62jq2icyn1l6s8kvdcsa6099vmykg2nxrafg9f83lb53q";
+  version = "1.2.1";
+  sha256 = "1f92q9wjj6npxfsjibw0qlg6pai721mwkjcadh121bwgrancflyr";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index d195d59dd3120..fd68a161c68c3 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.1.1";
-  sha256 = "1zx0r02k6znrm62wmhjcdlad3dil93kp6p862rvsvbkazwfy768a";
+  version = "1.2.2";
+  sha256 = "06ac99srh44rwj6mwyl7h0d0ckyb19dvpabylbawmks25v5ig0y3";
   buildDepends = [
     aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
     networkConduit safe shakespeareCss shakespeareJs text transformers
diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix
index 9bbfd381a0db2..bbfc6ed38cc38 100644
--- a/pkgs/development/libraries/java/classpath/default.nix
+++ b/pkgs/development/libraries/java/classpath/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
     # The exception makes it similar to LGPLv2+ AFAICS.
     license = "GPLv2+ + exception";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/java/icedtea/default.nix b/pkgs/development/libraries/java/icedtea/default.nix
index bdaa32a78d2c6..51f375a36f957 100644
--- a/pkgs/development/libraries/java/icedtea/default.nix
+++ b/pkgs/development/libraries/java/icedtea/default.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://icedtea.classpath.org/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
 
     # Restrict to GNU systems for now.
     platforms = stdenv.lib.platforms.gnu;
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 3e666c9fa234c..a61ea5e60452f 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -51,6 +51,6 @@ in
 
       licenses = [ "MPLv1.1" /* or */ "GPLv2+" ];
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix
index 0aee98d27bdab..c5ffed50be1b7 100644
--- a/pkgs/development/libraries/java/xalanj/default.nix
+++ b/pkgs/development/libraries/java/xalanj/default.nix
@@ -52,6 +52,6 @@ in
       homepage = http://xml.apache.org/xalan-j/;
       license = "Apache-2.0";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/libraries/java/xerces/default.nix b/pkgs/development/libraries/java/xerces/default.nix
index a40c30ae6c720..ed46747dbb20b 100644
--- a/pkgs/development/libraries/java/xerces/default.nix
+++ b/pkgs/development/libraries/java/xerces/default.nix
@@ -52,6 +52,6 @@ in
 
       license = "Apache-2.0";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 710f6bd87009c..c055284505430 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix
index 9b75e9fc0a8e8..79c734dcad62f 100644
--- a/pkgs/development/libraries/libchamplain/0.6.nix
+++ b/pkgs/development/libraries/libchamplain/0.6.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
          OpenCycleMap, OpenAerialMap, and Maps for free.
       '';
 
-     maintainers = [ stdenv.lib.maintainers.ludo ];
+     maintainers = [ ];
      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 6c32395397362..263b34701eedb 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
          OpenCycleMap, OpenAerialMap, and Maps for free.
       '';
 
-     maintainers = [ stdenv.lib.maintainers.ludo ];
+     maintainers = [ ];
      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index 3dee7ca6e3270..f9666ccf4ddcf 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 40eb2a10faf53..ac52876f887eb 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
     license = "LGPLv2+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index b1aaaa7f2c852..a3122dcf9a979 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 7f44e6b1706e3..249e9291fa376 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       dealing with different structured file formats.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index c13af5354299b..7562765a3ac3c 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/libiconv/;
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
 
     # This library is not needed on GNU platforms.
     platforms = [ "i686-cygwin" ];
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 94e785ee53b95..1bd8aaca9dca0 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index f49c885c066b1..a22ae64dfde56 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -1,13 +1,16 @@
 { stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "libjson-7.4.0";
+let
+  version = "7.6.1";
+in stdenv.mkDerivation rec {
+  name = "libjson-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/libjson/libjson_7.4.0.zip";
-    sha256 = "0rd6m3r3acm7xq6f0mbyyhc3dnwmiga60cws29yjl6nx2f9h3r0x";
+    url = "mirror://sourceforge/libjson/libjson_${version}.zip";
+    sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
   };
+  patches = [ ./install-fix.patch ];
   buildInputs = [ unzip ];
-  makeFlags = "prefix=$out";
+  makeFlags = [ "prefix=$(out)" ];
+  preInstall = "mkdir -p $out/lib";
   meta = {
     homepage = "http://libjson.sourceforge.net/";
     description = "A JSON reader and writer";
diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/development/libraries/libjson/install-fix.patch
new file mode 100644
index 0000000000000..f074c8ba3aa53
--- /dev/null
+++ b/pkgs/development/libraries/libjson/install-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur libjson-orig/makefile libjson/makefile
+--- libjson-orig/makefile	2012-05-30 05:15:42.000000000 -0400
++++ libjson/makefile	2013-08-15 09:17:41.154245534 -0400
+@@ -266,7 +266,7 @@
+ 	cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir)
+ 	chmod -R a+r $(include_path)/$(libname_hdr)
+ 	find  $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \;
+-	cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)
++	cp -rv $(srcdir)/../Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)/..
+ 	@echo "Install header files: Done."
+ 
+ clean: banner
diff --git a/pkgs/development/libraries/libkolab/default.nix b/pkgs/development/libraries/libkolab/default.nix
new file mode 100644
index 0000000000000..3475b22d26d48
--- /dev/null
+++ b/pkgs/development/libraries/libkolab/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl,
+ cmake, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libkolab-0.4.2";
+
+  src = fetchurl {
+    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
+    sha256 = "1wdbg42s14p472dn35n6z638i6n64f6mjjxmjam1r54pzsdykks6";
+  };
+
+  # We disable the Java backend, since we do not need them and they make the closure size much bigger
+#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = http://soprano.sourceforge.net/;
+    description = "An object-oriented C++/Qt4 framework for RDF data";
+    license = "LGPL";
+    maintainers = with stdenv.lib.maintainers; [ phreedo ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/libkolabxml/default.nix b/pkgs/development/libraries/libkolabxml/default.nix
new file mode 100644
index 0000000000000..c0217abd78634
--- /dev/null
+++ b/pkgs/development/libraries/libkolabxml/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, boost, curl, cmake, xercesc, qt4
+#, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libkolabxml-0.8.4";
+
+  src = fetchurl {
+    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
+    sha256 = "08gdhimnrhizpbvddj7cyz4jwwxrx5a70vz29cy989qgym2vn72q";
+  };
+
+  buildInputs = [ boost curl xercesc ];
+#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = http://soprano.sourceforge.net/;
+    description = "An object-oriented C++/Qt4 framework for RDF data";
+    license = "LGPL";
+    maintainers = with stdenv.lib.maintainers; [ phreedo ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 42f7c60610ec0..9ad9f944b4aff 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/libmicrohttpd/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 7cf9cbca51f83..8164b79e61b01 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "A C library for reading and writing files containing sampled sound";
     homepage    = http://www.mega-nerd.com/libsndfile/;
     license     = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ lovek323 ludo ];
+    maintainers = with maintainers; [ lovek323 ];
     platfomrs   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index f5c07f47379f3..ad5783ae4f832 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
new file mode 100644
index 0000000000000..9cf8decf4c835
--- /dev/null
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, mesa }:
+
+let version = "1.0.1"; in
+
+stdenv.mkDerivation rec {
+  name = "libtxc_dxtn-${version}";
+
+  src = fetchurl {
+    url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz";
+    sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv";
+  };
+
+  buildInputs = [ autoconf automake libtool mesa ];
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    homepage = http://dri.freedesktop.org/wiki/S3TC;
+  };
+}
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
new file mode 100644
index 0000000000000..74c6b8fa615e1
--- /dev/null
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.7";
+  name = "liburcu-${version}";
+
+  src = fetchurl {
+    url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
+    sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Userspace RCU (read-copy-update) library";
+    homepage = http://lttng.org/urcu;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
new file mode 100644
index 0000000000000..b831fd9bdd337
--- /dev/null
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "libvisual-0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libvisual/${name}.tar.gz";
+    sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
+  };
+
+  buildInputs = [ pkgconfig glib ];
+
+  meta = {
+    description = "An abstraction library for audio visualisations";
+    homepage = "http://sourceforge.net/projects/libvisual/";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platform = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh
index f8e4f5e0fd64f..112dbe0c5136d 100644
--- a/pkgs/development/libraries/libxml2/setup-hook.sh
+++ b/pkgs/development/libraries/libxml2/setup-hook.sh
@@ -11,7 +11,7 @@ addXMLCatalogs () {
 if test -z "$libxmlHookDone"; then
     libxmlHookDone=1
 
-    # Set http_proxy and ftp_proxy to a invalid host to prevent
+    # Set http_proxy and ftp_proxy to an invalid host to prevent
     # xmllint and xsltproc from trying to download DTDs from the
     # network even when --nonet is not given.  That would be impure.
     # (Note that .invalid is a reserved domain guaranteed not to
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 1da101478890c..f153c684629a9 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index 0ad2d4e47490d..5fba9c564181a 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     homepage = http://www.mcs.anl.gov/mpi/mpich2/;
     license = "free, see http://www.mcs.anl.gov/research/projects/mpich2/downloads/index.php?s=license";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d38fc19f40e12..de980d718f33e 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,68 +1,58 @@
-{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite
 , includeTools ? false
 }:
 
 let
 
-  nssPEM = fetchgit {
-    url = "git://git.fedorahosted.org/git/nss-pem.git";
-    rev = "07a683505d4a0a1113c4085c1ce117425d0afd80";
-    sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8";
+  nssPEM = fetchurl {
+    url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz;
+    sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201";
   };
 
   secLoadPatch = fetchurl {
     name = "security_load.patch";
-    urls = [
-      # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch"
-      # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD"
-      "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch"
-    ];
-    sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47";
+    urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch;
+    sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds";
   };
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.14.3";
+  version = "3.15.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz";
-    sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz";
+    sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
 
-  postUnpack = ''
-    cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \
-            "$sourceRoot/mozilla/security/nss/lib/ckfw/"
-    chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem"
+  prePatch = ''
+    xz -d < ${nssPEM} | patch -p1
   '';
 
-  patches = [
-    ./nss-3.14.1-gentoo-fixups-r1.patch
-    secLoadPatch
-    ./nix_secload_fixup.patch
-    ./sync-up-with-upstream-softokn-changes.patch
-  ];
+  patches =
+    [ ./nss-3.15-gentoo-fixups.patch
+      secLoadPatch
+      ./nix_secload_fixup.patch
+    ];
 
   postPatch = ''
-    sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn
-
-    # Fix up the patch from Gentoo
+    # Fix up the patch from Gentoo.
     sed -i \
       -e "/^PREFIX =/s|= /usr|= $out|" \
       -e '/@libdir@/s|gentoo/nss|lib|' \
       -e '/ln -sf/d' \
-      mozilla/security/nss/config/Makefile
+      nss/config/Makefile
 
     # Note for spacing/tab nazis: The TAB characters are intentional!
-    cat >> mozilla/security/nss/config/Makefile <<INSTALL_TARGET
+    cat >> nss/config/Makefile <<INSTALL_TARGET
     install:
     	mkdir -p \$(DIST)/lib/pkgconfig
     	cp nss.pc \$(DIST)/lib/pkgconfig
     INSTALL_TARGET
   '';
 
-  preConfigure = "cd mozilla/security/nss";
+  preConfigure = "cd nss";
 
   makeFlags = [
     "NSPR_INCLUDE_DIR=${nspr}/include/nspr"
@@ -74,8 +64,6 @@ in stdenv.mkDerivation rec {
     "NSS_USE_SYSTEM_SQLITE=1"
   ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1";
 
-  buildFlags = [ "build_coreconf" "build_dbm" "all" ];
-
   postInstall = ''
     rm -rf $out/private
     mv $out/public $out/include
@@ -83,6 +71,8 @@ in stdenv.mkDerivation rec {
     rmdir $out/*.OBJ
 
     cp -av config/nss-config $out/bin/nss-config
+
+    ln -s lib $out/lib64
   '';
 
   postFixup = ''
@@ -94,4 +84,9 @@ in stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (!includeTools) ''
     find $out/bin -type f \( -name nss-config -o -delete \)
   '';
+
+  meta = {
+    homepage = https://developer.mozilla.org/en-US/docs/NSS;
+    description = "A set of libraries for development of security-enabled client and server applications";
+  };
 }
diff --git a/pkgs/development/libraries/nss/nix_secload_fixup.patch b/pkgs/development/libraries/nss/nix_secload_fixup.patch
index 960fe0ef7a75d..89c82f1b87d48 100644
--- a/pkgs/development/libraries/nss/nix_secload_fixup.patch
+++ b/pkgs/development/libraries/nss/nix_secload_fixup.patch
@@ -1,18 +1,7 @@
-diff --git a/mozilla/security/coreconf/config.mk b/mozilla/security/coreconf/config.mk
-index 72557c6..bdcbf88 100644
---- a/mozilla/security/coreconf/config.mk
-+++ b/mozilla/security/coreconf/config.mk
-@@ -207,3 +207,5 @@ endif
- DEFINES += -DUSE_UTIL_DIRECTLY
- USE_UTIL_DIRECTLY = 1
- 
-+# nix specific stuff:
-+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
-diff --git a/mozilla/security/nss/cmd/shlibsign/shlibsign.c b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-index 5ce626e..e1e8039 100644
---- a/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-+++ b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-@@ -770,7 +770,7 @@ int main(int argc, char **argv)
+diff -ru -x '*~' nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.15.1/nss/cmd/shlibsign/shlibsign.c
+--- nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:03:40.013256377 +0200
++++ nss-3.15.1/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:04:21.128410153 +0200
+@@ -853,7 +853,7 @@
      assert(libname != NULL);
      lib = PR_LoadLibrary(libname);
      if (!lib)
@@ -21,11 +10,20 @@ index 5ce626e..e1e8039 100644
      assert(lib != NULL);
      PR_FreeLibraryName(libname);
  
-diff --git a/mozilla/security/nss/lib/util/secload.c b/mozilla/security/nss/lib/util/secload.c
-index 7d6fc22..0b7759b 100644
---- a/mozilla/security/nss/lib/util/secload.c
-+++ b/mozilla/security/nss/lib/util/secload.c
-@@ -105,9 +105,9 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+diff -ru -x '*~' nss-3.15.1-orig/nss/coreconf/config.mk nss-3.15.1/nss/coreconf/config.mk
+--- nss-3.15.1-orig/nss/coreconf/config.mk	2013-06-27 19:58:08.000000000 +0200
++++ nss-3.15.1/nss/coreconf/config.mk	2013-08-07 16:11:27.364608802 +0200
+@@ -181,3 +181,6 @@
+ 
+ # Build with NO_NSPR_10_SUPPORT to avoid using obsolete NSPR features
+ DEFINES += -DNO_NSPR_10_SUPPORT
++
++# Nix specific stuff.
++DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
+diff -ru -x '*~' nss-3.15.1-orig/nss/lib/util/secload.c nss-3.15.1/nss/lib/util/secload.c
+--- nss-3.15.1-orig/nss/lib/util/secload.c	2013-08-07 16:03:40.014256381 +0200
++++ nss-3.15.1/nss/lib/util/secload.c	2013-08-07 16:05:02.453563064 +0200
+@@ -70,9 +70,9 @@
      /* Remove the trailing filename from referencePath and add the new one */
      c = strrchr(referencePath, PR_GetDirectorySeparator());
      if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
@@ -38,7 +36,7 @@ index 7d6fc22..0b7759b 100644
      }
      if (c) {
          size_t referencePathSize = 1 + c - referencePath;
-@@ -125,8 +125,7 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+@@ -90,8 +90,7 @@
                  (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
                  memcpy(fullName + referencePathSize -4, "lib", 3);
              }
diff --git a/pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch b/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
index bc3a98ec14386..b3e35b1d2d193 100644
--- a/pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch
+++ b/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
@@ -1,9 +1,8 @@
-diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile
---- a/mozilla/security/nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/Makefile	2012-12-15 07:27:20.650148987 -0600
+--- a/nss/config/Makefile
++++ b/nss/config/Makefile
 @@ -0,0 +1,40 @@
-+CORE_DEPTH = ../..
-+DEPTH      = ../..
++CORE_DEPTH = ..
++DEPTH      = ..
 +
 +include $(CORE_DEPTH)/coreconf/config.mk
 +
@@ -19,14 +18,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
 +	mkdir -p $(DIST)/lib/pkgconfig
 +	sed -e "s,@prefix@,$(PREFIX)," \
 +	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/gentoo/nss," \
++	    -e "s,@libdir@,\$${prefix}/lib64," \
 +	    -e "s,@includedir@,\$${prefix}/include/nss," \
 +	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
 +	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
 +	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
 +	    nss.pc.in > nss.pc
 +	chmod 0644 nss.pc
-+	ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
 +
 +	# Create the nss-config script
 +	mkdir -p $(DIST)/bin
@@ -36,15 +35,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
 +	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
 +	    nss-config.in > nss-config
 +	chmod 0755 nss-config
-+	ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
++	ln -sf ../../../config/nss-config $(DIST)/bin
 +
 +libs:
 +
 +dummy: all export libs
 +
-diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in
---- a/mozilla/security/nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/nss-config.in	2012-12-15 07:27:20.651148959 -0600
+--- a/nss/config/nss-config.in
++++ b/nss/config/nss-config.in
 @@ -0,0 +1,145 @@
 +#!/bin/sh
 +
@@ -191,9 +189,8 @@ diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/con
 +      echo $libdirs
 +fi      
 +
-diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in
---- a/mozilla/security/nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/nss.pc.in	2012-12-15 07:27:20.651148959 -0600
+--- a/nss/config/nss.pc.in
++++ b/nss/config/nss.pc.in
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -207,37 +204,35 @@ diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/
 +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
 +Cflags: -I${includedir}
 +
-diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile
---- a/mozilla/security/nss/Makefile	2012-11-13 19:14:07.000000000 -0600
-+++ b/mozilla/security/nss/Makefile	2012-12-15 07:27:57.235162137 -0600
+--- a/nss/Makefile
++++ b/nss/Makefile
 @@ -44,7 +44,7 @@
  # (7) Execute "local" rules. (OPTIONAL).                              #
  #######################################################################
  
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
+-nss_build_all: build_nspr all
++nss_build_all: all
  
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+ nss_clean_all: clobber_nspr clobber
  
-@@ -106,12 +106,6 @@
+@@ -103,12 +103,6 @@
  	--with-dist-prefix='$(NSPR_PREFIX)' \
  	--with-dist-includedir='$(NSPR_PREFIX)/include'
  
 -build_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
 -
 -clobber_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
 -
- build_dbm:
- ifdef NSS_DISABLE_DBM
- 	@echo "skipping the build of DBM"
-diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn
---- a/mozilla/security/nss/manifest.mn	2012-03-20 09:46:49.000000000 -0500
-+++ b/mozilla/security/nss/manifest.mn	2012-12-15 07:27:20.652148933 -0600
-@@ -10,6 +10,6 @@
+ build_docs:
+ 	$(MAKE) -C $(CORE_DEPTH)/doc
+ 
+--- a/nss/manifest.mn
++++ b/nss/manifest.mn
+@@ -10,4 +10,4 @@
  
  RELEASE = nss
  
--DIRS = lib cmd
-+DIRS = lib cmd config
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config
diff --git a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch b/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch
deleted file mode 100644
index 4942debcd302c..0000000000000
--- a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001
-From: Elio Maldonado <emaldona@redhat.com>
-Date: Sat, 9 Feb 2013 17:11:00 -0500
-Subject: [PATCH] Sync up with upstream softokn changes
-
-- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and in a state of flux
-- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13' vulnerability CVE-2013-0169
-- It now compiles with the NSS_3_14_3_BETA1 source
----
- mozilla/security/nss/lib/ckfw/pem/rsawrapr.c |  338 +++++++-------------------
- 1 files changed, 82 insertions(+), 256 deletions(-)
-
-diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-index 5ac4f39..3780d30 100644
---- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-+++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-@@ -46,6 +46,7 @@
- #include "sechash.h"
- #include "base.h"
- 
-+#include "lowkeyi.h"
- #include "secerr.h"
- 
- #define RSA_BLOCK_MIN_PAD_LEN		8
-@@ -54,9 +55,8 @@
- #define RSA_BLOCK_PRIVATE_PAD_OCTET	0xff
- #define RSA_BLOCK_AFTER_PAD_OCTET	0x00
- 
--#define OAEP_SALT_LEN		8
--#define OAEP_PAD_LEN		8
--#define OAEP_PAD_OCTET		0x00
-+/* Needed for RSA-PSS functions */
-+static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
- 
- #define FLAT_BUFSIZE 512        /* bytes to hold flattened SHA1Context. */
- 
-@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk)
-     return 0;
- }
- 
--static SHA1Context *SHA1_CloneContext(SHA1Context * original)
--{
--    SHA1Context *clone = NULL;
--    unsigned char *pBuf;
--    int sha1ContextSize = SHA1_FlattenSize(original);
--    SECStatus frv;
--    unsigned char buf[FLAT_BUFSIZE];
--
--    PORT_Assert(sizeof buf >= sha1ContextSize);
--    if (sizeof buf >= sha1ContextSize) {
--        pBuf = buf;
--    } else {
--        pBuf = nss_ZAlloc(NULL, sha1ContextSize);
--        if (!pBuf)
--            goto done;
--    }
--
--    frv = SHA1_Flatten(original, pBuf);
--    if (frv == SECSuccess) {
--        clone = SHA1_Resurrect(pBuf, NULL);
--        memset(pBuf, 0, sha1ContextSize);
--    }
--  done:
--    if (pBuf != buf)
--        nss_ZFreeIf(pBuf);
--    return clone;
-+/* Constant time comparison of a single byte.
-+ * Returns 1 iff a == b, otherwise returns 0.
-+ * Note: For ranges of bytes, use constantTimeCompare.
-+ */
-+static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) {
-+    unsigned char c = ~(a - b | b - a);
-+    c >>= 7;
-+    return c;
- }
- 
--/*
-- * Modify data by XORing it with a special hash of salt.
-+/* Constant time comparison of a range of bytes.
-+ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise
-+ * returns 0.
-  */
--static SECStatus
--oaep_xor_with_h1(unsigned char *data, unsigned int datalen,
--                 unsigned char *salt, unsigned int saltlen)
--{
--    SHA1Context *sha1cx;
--    unsigned char *dp, *dataend;
--    unsigned char end_octet;
--
--    sha1cx = SHA1_NewContext();
--    if (sha1cx == NULL) {
--        return SECFailure;
--    }
--
--    /*
--     * Get a hash of salt started; we will use it several times,
--     * adding in a different end octet (x00, x01, x02, ...).
--     */
--    SHA1_Begin(sha1cx);
--    SHA1_Update(sha1cx, salt, saltlen);
--    end_octet = 0;
--
--    dp = data;
--    dataend = data + datalen;
--
--    while (dp < dataend) {
--        SHA1Context *sha1cx_h1;
--        unsigned int sha1len, sha1off;
--        unsigned char sha1[SHA1_LENGTH];
--
--        /*
--         * Create hash of (salt || end_octet)
--         */
--        sha1cx_h1 = SHA1_CloneContext(sha1cx);
--        SHA1_Update(sha1cx_h1, &end_octet, 1);
--        SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1));
--        SHA1_DestroyContext(sha1cx_h1, PR_TRUE);
--        PORT_Assert(sha1len == SHA1_LENGTH);
--
--        /*
--         * XOR that hash with the data.
--         * When we have fewer than SHA1_LENGTH octets of data
--         * left to xor, use just the low-order ones of the hash.
--         */
--        sha1off = 0;
--        if ((dataend - dp) < SHA1_LENGTH)
--            sha1off = SHA1_LENGTH - (dataend - dp);
--        while (sha1off < SHA1_LENGTH)
--            *dp++ ^= sha1[sha1off++];
--
--        /*
--         * Bump for next hash chunk.
--         */
--        end_octet++;
--    }
--
--    SHA1_DestroyContext(sha1cx, PR_TRUE);
--    return SECSuccess;
-+static unsigned char constantTimeCompare(const unsigned char *a,
-+                                         const unsigned char *b,
-+                                         unsigned int len) {
-+    unsigned char tmp = 0;
-+    unsigned int i;
-+    for (i = 0; i < len; ++i, ++a, ++b)
-+        tmp |= *a ^ *b;
-+    return constantTimeEQ8(0x00, tmp);
- }
- 
--/*
-- * Modify salt by XORing it with a special hash of data.
-+/* Constant time conditional.
-+ * Returns a if c is 1, or b if c is 0. The result is undefined if c is
-+ * not 0 or 1.
-  */
--static SECStatus
--oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen,
--                 unsigned char *data, unsigned int datalen)
-+static unsigned int constantTimeCondition(unsigned int c,
-+                                          unsigned int a,
-+                                          unsigned int b)
- {
--    unsigned char sha1[SHA1_LENGTH];
--    unsigned char *psalt, *psha1, *saltend;
--    SECStatus rv;
--
--    /*
--     * Create a hash of data.
--     */
--    rv = SHA1_HashBuf(sha1, data, datalen);
--    if (rv != SECSuccess) {
--        return rv;
--    }
--
--    /*
--     * XOR the low-order octets of that hash with salt.
--     */
--    PORT_Assert(saltlen <= SHA1_LENGTH);
--    saltend = salt + saltlen;
--    psalt = salt;
--    psha1 = sha1 + SHA1_LENGTH - saltlen;
--    while (psalt < saltend) {
--        *psalt++ ^= *psha1++;
--    }
--
--    return SECSuccess;
-+    return (~(c - 1) & a) | ((c - 1) & b);
- }
- 
- /*
-@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
-     unsigned char *block;
-     unsigned char *bp;
-     int padLen;
--    int i;
-+    int i, j;
-     SECStatus rv;
- 
-     block = (unsigned char *) nss_ZAlloc(NULL, modulusLen);
-@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
-          */
-     case RSA_BlockPublic:
- 
--        /*
--         * 0x00 || BT || Pad || 0x00 || ActualData
--         *   1      1   padLen    1      data->len
--         * Pad is all non-zero random bytes.
--         */
--        padLen = modulusLen - data->len - 3;
--        PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN);
--        if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--        for (i = 0; i < padLen; i++) {
--            /* Pad with non-zero random data. */
--            do {
--                rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
--            } while (rv == SECSuccess
--                     && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
--            if (rv != SECSuccess) {
--                nss_ZFreeIf(block);
--                return NULL;
--            }
--        }
--        bp += padLen;
--        *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
--        nsslibc_memcpy(bp, data->data, data->len);
--
--        break;
--
--        /*
--         * Blocks intended for public-key operation, using
--         * Optimal Asymmetric Encryption Padding (OAEP).
--         */
--    case RSA_BlockOAEP:
--        /*
--         * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData)
--         *   1      1     OAEP_SALT_LEN     OAEP_PAD_LEN + data->len [+ N]
--         *
--         * where:
--         *   PaddedData is "Pad1 || ActualData [|| Pad2]"
--         *   Salt is random data.
--         *   Pad1 is all zeros.
--         *   Pad2, if present, is random data.
--         *   (The "modified" fields are all the same length as the original
--         * unmodified values; they are just xor'd with other values.)
--         *
--         *   Modified1 is an XOR of PaddedData with a special octet
--         * string constructed of iterated hashing of Salt (see below).
--         *   Modified2 is an XOR of Salt with the low-order octets of
--         * the hash of Modified1 (see farther below ;-).
--         *
--         * Whew!
--         */
--
--
--        /*
--         * Salt
--         */
--        rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN);
--        if (rv != SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--        bp += OAEP_SALT_LEN;
--
--        /*
--         * Pad1
--         */
--        nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN);
--        bp += OAEP_PAD_LEN;
--
--        /*
--         * Data
--         */
--        nsslibc_memcpy(bp, data->data, data->len);
--        bp += data->len;
--
--        /*
--         * Pad2
--         */
--        if (bp < (block + modulusLen)) {
--            rv = RNG_GenerateGlobalRandomBytes(bp,
--                                               block - bp + modulusLen);
--            if (rv != SECSuccess) {
--                nss_ZFreeIf(block);
--                return NULL;
--            }
--        }
--
--        /*
--         * Now we have the following:
--         * 0x00 || BT || Salt || PaddedData
--         * (From this point on, "Pad1 || Data [|| Pad2]" is treated
--         * as the one entity PaddedData.)
--         *
--         * We need to turn PaddedData into Modified1.
--         */
--        if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN,
--                             modulusLen - 2 - OAEP_SALT_LEN,
--                             block + 2, OAEP_SALT_LEN) != SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--
--        /*
--         * Now we have:
--         * 0x00 || BT || Salt || Modified1(PaddedData)
--         *
--         * The remaining task is to turn Salt into Modified2.
--         */
--        if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN,
--                             block + 2 + OAEP_SALT_LEN,
--                             modulusLen - 2 - OAEP_SALT_LEN) !=
--            SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--
--        break;
-+	/*
-+	 * 0x00 || BT || Pad || 0x00 || ActualData
-+	 *   1      1   padLen    1      data->len
-+	 * Pad is all non-zero random bytes.
-+	 *
-+	 * Build the block left to right.
-+	 * Fill the entire block from Pad to the end with random bytes.
-+	 * Use the bytes after Pad as a supply of extra random bytes from 
-+	 * which to find replacements for the zero bytes in Pad.
-+	 * If we need more than that, refill the bytes after Pad with 
-+	 * new random bytes as necessary.
-+	 */
-+	padLen = modulusLen - (data->len + 3);
-+	PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
-+	if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
-+	    nss_ZFreeIf (block);
-+	    return NULL;
-+	}
-+	j = modulusLen - 2;
-+	rv = RNG_GenerateGlobalRandomBytes(bp, j);
-+	if (rv == SECSuccess) {
-+	    for (i = 0; i < padLen; ) {
-+		unsigned char repl;
-+		/* Pad with non-zero random data. */
-+		if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
-+		    ++i;
-+		    continue;
-+		}
-+		if (j <= padLen) {
-+		    rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
-+					  modulusLen - (2 + padLen));
-+		    if (rv != SECSuccess)
-+		    	break;
-+		    j = modulusLen - 2;
-+		}
-+		do {
-+		    repl = bp[--j];
-+		} while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
-+		if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
-+		    bp[i++] = repl;
-+		}
-+	    }
-+	}
-+	if (rv != SECSuccess) {
-+	    /*sftk_fatalError = PR_TRUE;*/
-+	    nss_ZFreeIf (block);
-+	    return NULL;
-+	}
-+	bp += padLen;
-+	*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
-+	nsslibc_memcpy(bp, data->data, data->len);
-+	break;
- 
-     default:
-         PORT_Assert(0);
-@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen,
- 
-         break;
- 
--    case RSA_BlockOAEP:
--        /*
--         * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2])
--         *
--         * The "2" below is the first octet + the second octet.
--         * (The other fields do not contain the clear values, but are
--         * the same length as the clear values.)
--         */
--        PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN
--                                                + OAEP_PAD_LEN)));
--
--        result->data = rsa_FormatOneBlock(modulusLen, blockType, data);
--        if (result->data == NULL) {
--            result->len = 0;
--            return SECFailure;
--        }
--        result->len = modulusLen;
--
--        break;
--
-     case RSA_BlockRaw:
-         /*
-          * Pad || ActualData
--- 
-1.7.1
-
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index b24b4e06cb943..2ba6b5cb9078c 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
new file mode 100644
index 0000000000000..26ef47199e308
--- /dev/null
+++ b/pkgs/development/libraries/re2/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "re2";
+  version = "20130802";
+
+  src = fetchurl {
+    url = "https://re2.googlecode.com/files/${name}-${version}.tgz";
+    sha256 = "12yxbjsnc1ym7jny470wbnb6h3rgsfv0z75vdp12npklck5nmwhp";
+  };
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace "/usr/local" "$out"
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/re2/;
+    description = "An efficient, principled regular expression library";
+    license = with stdenv.lib.licenses; bsd3;
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index e54eaba4f15a5..f1c99397452df 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -38,7 +38,10 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Linear Algebra PACKage";
-    license = "revised-BSD";
     homepage = "http://www.netlib.org/lapack/";
+    license = "revised-BSD";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 869536820340c..02a1008cda5d8 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://tdb.samba.org/;
     license = "LGPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 431b877397838..b6faee6c2986e 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index 59afb3345cacd..82ce734d17358 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix
index b623c7731423a..ee742487e263a 100644
--- a/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2.1+";
 
     platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index ca0427481daf2..699da60768f2f 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/commoncpp/;
     license = "LGPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ viric ludo ];
+    maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index e9de92fb3ced6..69e53d4e8f641 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://zziplib.sourceforge.net/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = python.meta.platforms;
   };
 }